178214
@@ -18,6 +18,25 @@
package org.springframework.data.gemfire.mapping.model;
 
 import java.math.BigDecimal;
 import java.math.BigInteger;
+import java.time.Duration;
+import java.time.Instant;
+import java.time.LocalDate;
+import java.time.LocalDateTime;
+import java.time.LocalTime;
+import java.time.MonthDay;
+import java.time.OffsetDateTime;
+import java.time.OffsetTime;
+import java.time.Period;
+import java.time.Year;
+import java.time.YearMonth;
+import java.time.ZoneOffset;
+import java.time.ZonedDateTime;
+import java.time.chrono.ChronoLocalDate;
+import java.time.chrono.ChronoLocalDateTime;
+import java.time.chrono.ChronoPeriod;
+import java.time.chrono.ChronoZonedDateTime;
+import java.time.chrono.Chronology;
+import java.time.chrono.Era;
 import java.util.HashSet;
 import java.util.Set;
 
@@ -41,6 +60,25 @@
public class GemfireSimpleTypeHolder extends SimpleTypeHolder {
 	static {
 		CUSTOM_SIMPLE_TYPES.add(BigDecimal.class);
 		CUSTOM_SIMPLE_TYPES.add(BigInteger.class);
+		CUSTOM_SIMPLE_TYPES.add(ChronoLocalDate.class);
+		CUSTOM_SIMPLE_TYPES.add(ChronoLocalDateTime.class);
+		CUSTOM_SIMPLE_TYPES.add(Chronology.class);
+		CUSTOM_SIMPLE_TYPES.add(ChronoPeriod.class);
+		CUSTOM_SIMPLE_TYPES.add(ChronoZonedDateTime.class);
+		CUSTOM_SIMPLE_TYPES.add(Duration.class);
+		CUSTOM_SIMPLE_TYPES.add(Era.class);
+		CUSTOM_SIMPLE_TYPES.add(Instant.class);
+		CUSTOM_SIMPLE_TYPES.add(LocalDate.class);
+		CUSTOM_SIMPLE_TYPES.add(LocalDateTime.class);
+		CUSTOM_SIMPLE_TYPES.add(LocalTime.class);
+		CUSTOM_SIMPLE_TYPES.add(MonthDay.class);
+		CUSTOM_SIMPLE_TYPES.add(OffsetDateTime.class);
+		CUSTOM_SIMPLE_TYPES.add(OffsetTime.class);
+		CUSTOM_SIMPLE_TYPES.add(Period.class);
+		CUSTOM_SIMPLE_TYPES.add(Year.class);
+		CUSTOM_SIMPLE_TYPES.add(YearMonth.class);
+		CUSTOM_SIMPLE_TYPES.add(ZonedDateTime.class);
+		CUSTOM_SIMPLE_TYPES.add(ZoneOffset.class);
 	}
 
 	/**
